xm: xen-api: Install create.dtd in SHAREDIR

* Install create.dtd in SHAREDIR
* Use SHAREDIR/create.dtd
* import os.path.join into xenapi_create.py,
  it already seems to be used many times

Resolves the following error when using XenAPI:

$ xm create hvm.conf
Couldn't open resource '/usr/share/xen/create.dtd' at
/usr/share/xen/create.dtd:1:0

Signed-off-by: Simon Horman <horms@verge.net.au>

diff --git a/tools/python/Makefile b/tools/python/Makefile
index 7d9394cca9eef1d479ad0d3e164ecc42ad1ae016..295bd36ec8f0cc16ed2bd9e7c366411f28dfa4e0 100644 (file)
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -22,6 +22,7 @@ genpath:
        echo "BINDIR=\"$(BINDIR)\"" >> ${xenpath}
        echo "LIBEXEC=\"$(LIBEXEC)\"" >> ${xenpath}
        echo "LIBDIR=\"$(LIBDIR)\"" >> ${xenpath}
+       echo "SHAREDIR=\"$(SHAREDIR)\"" >> ${xenpath}
        echo "PRIVATE_BINDIR=\"$(PRIVATE_BINDIR)\"" >> ${xenpath}
        echo "XEN_CONFIG_DIR=\"$(XEN_CONFIG_DIR)\"" >> ${xenpath}
        echo "XEN_SCRIPT_DIR=\"$(XEN_SCRIPT_DIR)\"" >> ${xenpath}
@@ -70,8 +71,8 @@ install: install-messages install-dtd
                $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" --force
 
 install-dtd: all
-       $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
-       $(INSTALL_DATA) xen/xm/create.dtd $(DESTDIR)$(DOCDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+       $(INSTALL_DATA) xen/xm/create.dtd $(DESTDIR)$(SHAREDIR)
 
 install-messages: all
        set -e; if which $(MSGFMT) >/dev/null ; then \

diff --git a/tools/python/xen/xm/xenapi_create.py b/tools/python/xen/xm/xenapi_create.py
index 2ae56de9c71f87fd2fde341191cef000161f089b..ae9c0326cd756884775efcaae342c0f80dac1b73 100644 (file)
--- a/tools/python/xen/xm/xenapi_create.py
+++ b/tools/python/xen/xm/xenapi_create.py
@@ -26,10 +26,12 @@ from xen.xend.XendAPIConstants import XEN_API_ON_NORMAL_EXIT, \
      XEN_API_ON_CRASH_BEHAVIOUR
 from xen.xm.opts import OptionError
 from xen.util import xsconstants
+from xen.util.path import SHAREDIR
 import xen.util.xsm.xsm as security
 
 import sys
 import os
+from os.path import join
 import traceback
 import re
 
@@ -75,7 +77,7 @@ class xenapi_create:
     def __init__(self):
         self.DEFAULT_STORAGE_REPOSITORY = get_default_SR()
 
-        self.dtd = "/usr/share/xen/create.dtd"
+        self.dtd = join(SHAREDIR, "create.dtd")
 
     def create(self, filename=None, document=None, skipdtd=False):
         """